DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master Bug: 120502534 Change-Id: Ie2c27480f248101768cb79e25ea6c10585584f14